Fix #146

  • Resolved merge conflicts.

Comment From: markpollack

Thanks! Cleaned up some docs and merged as dd64a50d2f249c86c27b8c0edd98c2452fffc6d0