Changes
Merge pull request #20 from cpinski/development

Changes