Fix bug #1 and #2
Bump version