Merge pull request #1 from i07/marc

small cleanup