Merge pull request #368 from etosch/untested

Untested
Merge pull request #370 from etosch/untested

Untested
Merge pull request #383 from etosch/untested

Untested
Merge pull request #389 from etosch/untested

Untested
Merge pull request #398 from etosch/master

resetting
Merge remote-tracking branch 'remotes/upstream/untested' into untested