final change
Merge remote-tracking branch 'upstream/master'
Added documentation and header file
Changed the encoding of the file documentation
included documentation file in the root file
corrected documentation
corrected documentation and header file
Merged A-Kostrov