added docs
Merge branch 'RC1/master' into RC1/add_data
added more comments
clean up