Merge pull request #24 from cnlpete/development

Development