Merge pull request #21 from Blisst-Mobile/development

Development
Merge pull request #23 from Blisst-Mobile/development

Development
Merge pull request #24 from Blisst-Mobile/development

Development