bug fixes

Change-Id: I42d8ea5f5a1ff1d9d4130535bf8b7d445039c616
Merge branch 'master' of github.com:mati1979/play-hysterix