Merge pull request #37 from FlyoverWorks/dev

Dev
Merge branch 'dev'
Fix #41