bugfix
Merge pull request #170 from wgerlach/master

bugfix