Fixes/Updates
Merge pull request #13 from mr-bo-jangles/develop

Fixes/Updates