Merge pull request #29 from cnlpete/development

[3.1] Development