Merge pull request #5 from cnlpete/development

fixes