Pull request - 08-25-2014

First code review
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.