Merge pull request #38 from InebriatedSquirrel/master

Update to latest master version