Added header file and documentation
Merge remote-tracking branch 'upstream/master'
some changes in header and doc file. doc file added in index.rst
Merged and fixed conflict