Adding documentation per issue #248
Merge branch 'master' into develop