Version 3.5.4
Merge pull request #349 from getusedtoit/master

Version 3.5.4