added documentation
Merge remote-tracking branch 'cjshannon/dev' into dev