fix #58 and #59

I don't know if creating a pull request with merge commit in it is a good idea or not ?
should I avoid that ?