Fix #6
Merge branch 'issue_6'

* issue_6:
  Fix #6