cleaned up a bit docs
Merge branch 'updated_docs'
fix #354