Fix #3

Ready to release v0.6.2