issue #33
Merge pull request #35 from gxcast/master

issue #33