Pull request - 08-25-2014

First code review
Use 2 (not 1) spaces for indentation.