Merge pull request #37 from unidal/master

update dependencies
Merge pull request #42 from unidal/master

refactor