fix #7, #8
Merge pull request #9 from couzteau/0.5.6

fix #7, #8