fix ACT-1755
Merge pull request #143 from smirzai/act-1755

fix ACT-1755
Merge remote-tracking branch 'upstream/master'