Pull request - 08-25-2014

First code review
Use 2 (not 4) spaces for indentation.<br>Do not write to stdout. Use Rails' logger if you want to log.