Merge pull request #44 from White-Oak/master

Some work on #42