Fix for #6.
accidentally made fix for #6 off of master instead of develop.  Should be ok now.
Merge branch 'issue-6' of github.com:eschkufz/cpputil into issue-6
Still cleaning up from the bad branch.  Fixed indentation too.
Another iteration of testing against stoke foe #6...
Found another undefined read in #6
Merge branch 'issue-6' into develop