Merge pull request #6 from nickoram/master

TASK-5: update references to y value using width
TASK-5: cleaning naming conventions on class members