First functional version with a ton of bugs
Merge pull request #1 from dcampoy/master

First functional version with a ton of bugs