master #12

Closed
Igor1 wants to merge 4 commits from master into develop