Version 0.6.2, fixes #9 and #11