Merge pull request #45 from QudeApp/development

Development