Merge pull request #7 from narrowspark/develop

Develop
update mockery
Merge pull request #50 from prisis/develop

Develop