Merge pull request #267 from theponti/development

Development
Refactor style and syntax