some lingering stuff on my laptop
Merge pull request #448 from etosch/untested

some lingering stuff on my laptop