Version 3.6.1

I promise I'll slow down with the new releases :)
Merge pull request #654 from getusedtoit/master

Version 3.6.1