Update all to 1.4.7, fix a couple of bugs
Merge pull request #2 from LazDude2012/master

Updating forked source