Mark was here.
Merge pull request #1 from trinberg/branch1

Mark was here.