Merge changes from Dev branch
Merge pull request #52 from filipstefansson/dev-merge

Merge changes from Dev branch