fix issue #12
fix issue #14
Merge branch 'fix-issue-12'
bump version