Develop

Please take a look at the changes in commit 52e7ba1.
Ignore the other commits int this branch.