Refactored some of the code
BugFix
Refactored a little bit of the code
Changed version number
Merge pull request #10 from jonathanostinowsky/CodeRefactoring

Code refactoring