Working version
Merge branch 'master' of https://github.com/waseemAtRice/glass-present