Merge branch 'master' of github.com:CHI2013/glance
Merge branch 'master' of github.com:CHI2013/glance