Merge branch 'master' of https://github.com/officekang/sandglass
Merge branch 'master' of https://github.com/officekang/sandglass