Merge pull request #1 from nssh/master

Merging pull request from nssh
Merge pull request #2 from nssh/master

WIP: added few texts and figures to the report
Merge remote-tracking branch 'upstream/master'