Merge pull request #5 from jorge-trujillo/develop

Release 0.1 - Working code
Added another feature
Merge pull request #6 from jorge-trujillo/last-feature

Last feature