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

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