Merge pull request #101 from etosch/master

merging before deletion
Merge pull request #102 from etosch/untested

Merge pull request #101 from etosch/master