fix issue 6
Merge branch 'master' into fixes

* master:
  fix issue 6