Pull request - 08-25-2014

First code review
Avoid using {...} for multi-line blocks.