Merge pull request #7 from dotdoom/master-features

Refactoring and renaming