better version
Merge pull request #16 from vallettea/master

better version