More formatting change
Fixed conflicts during merge with Greg's latest changes
Merge pull request #172 from dpefour/master

More formatting change