resolve #17 #13
resolve #19
Merge pull request #20 from josewilsoncc/develop

Develop