hotfix
Merge pull request #83 from chipsergik/S5-iter1

hotfix
Merge remote-tracking branch 'origin/S5-iter1'