Please pull this set of changes #2

Merged
merged 9 commits into from Feb 1, 2012