Adding handler
Merge branch 'master' of https://github.com/aaliang/chillout_app