Maybe fix the dev-branch
Merge dev-branch with master