Merge pull request #9 from elmer-garduno/master

Merge pull requests from deflaux/master