Improved App Mock
Merge pull request #1 from martindido/improvements

Improved App Mock