fixed issue20
Merge branch 'issue20' into dev
Version v1.1.5