Fix installation issue of v2.0.6 (#154), together with minor bugs.

Fix installation issue (#154) related to v2.0.6 Fix also minor bugs Updated documentation