Refactoring. Road to v1.0.0
Merge pull request #14 from dgraziotin/master

Refactoring. Seems stable.