gh-1530
Merge pull request #17 from patoi/gh-1530

* gh-1530:
  gh-1530