Merge pull request #1 from i07/marc

small cleanup
Merge pull request #2 from i07/master

Merge pull request #1 from i07/marc