minor fixes
Merge pull request #57 from badnack/development

minor fixes