Merge pull request #3 from Unitech/development

Development
Merge pull request #4 from Unitech/development

Development
fix: travis
Merge pull request #859 from Tjatse/development

fix: travis