Refactoring
Code Polished, Finally Fix #2
Merge pull request #10 from dgraziotin/master

Refactoring (not complete), Finally Fix #2