Merge pull request #42 from InebriatedSquirrel/master

Update to latest master version
Merge pull request #43 from InebriatedSquirrel/test-R3

Merge pull request #42 from InebriatedSquirrel/master