Development to master merge

http://redmine.ruswizards.com:8100/redmine/boards/8/topics/127