Revert "Revert "Merge pull request #3 from goinnn/master""

This reverts commit 122cd9fcfedb1381cfdba93e2c4c281c13e2012c.