Bugfix
Merge branch 'master' of https://github.com/smab/playhouse-web