fix #16
fix #17
Merge pull request #26 from ClementJnc/master

fix #16, fix #17