Version 3.6
Merge pull request #592 from getusedtoit/master

Version 3.6