Merge pull request #1 from henrikstranneheim/develop

Develop
Merge pull request #2 from henrikstranneheim/develop

Develop
Merge pull request #4 from henrikstranneheim/master

Added robins changes