working repo :D
Lot of changes
Merge pull request #5 from gadiel/Alex

working repo :D