Merge pull request #26 from adamretter/master

A couple of small features and greater flexibility with white space