Merged in masterschlumpf/beremiz/wx3-fix (pull request #37)

2019-01-07, Andrey Skvortsov