Merge pull request #315 from etosch/untested

Untested
runtime updates and a few bug fixes