Head in progress
Merge pull request #32 from alanandrade/master

Head in progress