Merge pull request #47 from InebriatedSquirrel/master

Update to latest master
Merge pull request #50 from InebriatedSquirrel/Frankie

Merge pull request #47 from InebriatedSquirrel/master