Merge pull request #44 from White-Oak/master

Some work on #42
Merge pull request #45 from White-Oak/develop

Merge pull request #44 from White-Oak/master