Merge pull request #47 from InebriatedSquirrel/master

Update to latest master