Merge pull request #14 from cnlpete/development

Improvements
minor improvements
correct type