merge master
merging with master for doc creation
updated docs