fix #279
Merge pull request #280 from felixonmars/dev

fix #279