Fixes

Fixes of issues #1, #3 et #4