tmalsburg Merge pull request #37 from aglet/fix-merge