Update development branch with latest updates from master

[Mindavi]

I'd normally expect this to happen the other way, but apparently this didn't go well.

If one wants to work from the development branch it needs to be at least up to date with master, otherwise you're never gonna be able to merge dev into master.

[zachkont]

You are absolutely right. This project has been poorly maintained so far and this is entirely my fault. I will sync the branches