Version 3.5.5

Getting ready in time ;)
Merge pull request #353 from getusedtoit/master

Version 3.5.5