Development updates
Almost done!
Style fixes and bug fixes
Merge pull request #1 from 1lann/development

Development -> master