Merge pull request #40 from InebriatedSquirrel/master

Update to latest master version
Merge pull request #41 from InebriatedSquirrel/test_Sam

Merge pull request #40 from InebriatedSquirrel/master