Pull request - 08-25-2014

First code review
Use 2 (not 1) spaces for indentation.<br>Space missing after comma.<br>Tab detected.<br>Use snake_case for variables.