bug fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #61 from ffrensch/master

fix