Push my latest fixes to creative.
Merge pull request #455 from alexbegt/master

Push my latest fixes to creative.