Docq #70

Merged
merged 10 commits into from Mar 8, 2014