Merged in Surkovsv/beremiz (pull request #4)

2016-09-12, Andrey Skvortsov