Fixed #29
Fixed #30
Merge branch 'issue30'
Bump version