#define formatting is now better.
Merge pull request #1 from gregghz/master

#define formatting is now better.