Fixed issue #59
Merge pull request #60 from steffenbrem/master

Fixed issue #59