Fixed #19
Fixed #18
Bump version