master #1

Closed
YanTheKaller wants to merge 2 commits from master into develop