fixed issue 19
Merge branch 'issue19' into dev
Version v1.1.4
Merge branch 'dev'