Bug fixes
Merge pull request #40 from timothymiko/development

Bug fixes
Merge pull request #41 from Blisst-Mobile/development

Development