Merge dev and master

The long waited version 0.8.5 is coming really soon!