Updated Readme.md documentation.
Name refactoring among the classes.
Merge branch 'Vicow'

Please enter a commit message to explain why this merge is necessary,