pr1 #1

Merged
ston1th merged 2 commits from pr1 into master 2018-12-24 17:22:09 +01:00