Fixed #14
Fixed #15
Fixed #13
Bump version