develop #1

Closed
mewin wants to merge 14 commits from develop into master