fix merge problems at runtime
Merge pull request #21 from hegner/master

fix merge problems