fix errors
Merge branch 'master' of https://github.com/dhasegan/mocks
Merge branch 'master' of https://github.com/dhasegan/mocks
Merge branch 'master' of https://github.com/dhasegan/mocks