I made alot of changes but I plan on working on it some more tonight.
Merge pull request #8 from aneurycasado/master

Changes