_
_
_
sibrp
npmas
Merge pull request #3 from lakesare/master

Refactoring and correction