#10 fix use of app to make dependency injection to app module easier
fix merge conflict