Fixed issue 17.
Version v1.1.1
Merge branch 'issue17' into dev