address #149
Merge remote-tracking branch 'origin/issue_149'