Updating string formatting #504

Merged
merged 4 commits into from Jul 3, 2011