develop #18

Closed
Igor1 wants to merge 12 commits from develop into develop