Done! Could be Better.
Merge pull request #17 from rbkloss/ricardo

Done! Could be Better.