Fix #8
Merge branch 'issue_8'

* issue_8:
  Fix #8