Updated documentation and minor fix to wavefront parsing.
Fixed conflict.
Merge branch 'tsherif-doc-update'