Story 1: Fix application
Merge https://github.com/kosandre/happy-runner
commit 2 : merge