mabelc Merge pull request #1 from cbergmeir/master