Merge pull request #18 from innokenty-shuvalov/master

refact and upgrade dependencies