close #128
close #134
Merge branch 'issue-134' into develop
version 1.1.0-60-alpha