review
Merge pull request #11 from CircleCode/3.2/review/Eric-Brison/apiDoc

review