remove duplication
Merge pull request #301 from mklose/master

remove duplication
Merge remote-tracking branch 'upstream/master'