Merge pull request #18 from zpydr/master

pull
Merge pull request #19 from zpydr/dev

Merge pull request #18 from zpydr/master