Merge pull request #7 from easyrecover/dev

Merge pull request #6 from easyrecover/master
Merge pull request #8 from easyrecover/master

Merge pull request #7 from easyrecover/dev