fixed bugs.
Merge branch 'master' of https://github.com/raycoarana-mns/hackathonglass