Merge pull request #40 from InebriatedSquirrel/master

Update to latest master version