Merge pull request #6 from easyrecover/master

get from master branch
Merge pull request #7 from easyrecover/dev

Merge pull request #6 from easyrecover/master