Merge pull request #347 from etosch/untested

Untested
working outside