Merge pull request #23 from samuelyuri/develop

Develop
v1.0.3