Merge pull request #42 from InebriatedSquirrel/master

Update to latest master version