Merge pull request #22 from cnlpete/development

tiny fixes