Fix #3 and #5. Bump version to 0.6.1