Close #13 !

The temp fix has been improved and will be on v1.0