Fix #24
Update to 0.6.1