fix issue #13 and #14
Prepare 0.6.2 release