renaming some methods, bit of refactoring
Merge pull request #2 from julianh2o/master

renaming some methods, bit of refactoring