refactoring names
updating readme
Merge pull request #44 from taotetek/master

Problem: Inconsistent Naming