Merge pull request #38 from InebriatedSquirrel/master

Update to latest master version
Merge pull request #39 from InebriatedSquirrel/test-Richard

Merge pull request #38 from InebriatedSquirrel/master