develop #2

Closed
mewin wants to merge 15 commits from develop into master
No description provided.