Merge pull request #39 from PineappleApp/development

Development