semantics
white space management
Merge pull request #3 from CraigSGrant/changes

Changes