Fixed code formatting issues
Merge pull request #2 from peterfomin/development

Fixed code formatting issues