Fix issue #3

I finally open a pull request, it may be will better for discussion !