fix issue #1, #2
Prepare 0.1.8 release