Conv accept #115

Merged
merged 4 commits into from Mar 29, 2013