Fixed issues #37 & #38, fixed in use field
Merge pull request #40 from EtienneOz/master

Fixed issues #37 & #38, fixed in use field