Timproposal #5

Merged
merged 23 commits into from May 21, 2012