bugfix 1
Merge pull request #1 from 867117/master

bugfix 1