Improved some method names and comments.
Merge branch 'develop'