Merge pull request #40 from ruphy/master

chore: merge develop->master