gh-1378
Merge pull request #9 from mbyrne00/master

* pull9:
  gh-1378