Fix #7
Merge branch 'issue_7'

* issue_7:
  Fix #7