many methods renamed
Merge pull request #22 from esteit/refactor

Refactor