Heitcamp, Fixes #40
Merge pull request #561 from evonfriedland/master

Heitcamp, Fixes #40