Merge pull request #2 from jusdev/master

update to latest version
Merge pull request #3 from jusdev/dev

Merge pull request #2 from jusdev/master