Pull request - 08-25-2014

First code review
Redundant `self` detected.<br>Tab detected.