Merge pull request #26 from cnlpete/development

quickfix