Changes for a private project #2

Merged
merged 2 commits into from Sep 16, 2011