Further updates

I need further input from the team, reply/add information a soon as
possible.
Merge pull request #12 from Eduardo-Arevalos/master

Further updates