Bug fixes
Merge pull request #40 from timothymiko/development

Bug fixes