Merge pull request #3 from rpiccio/development

Fixes some minor style issues