working changes in order to pull
Merge branch 'master' of https://github.com/timgrut/live_again