my updates
Merge branch 'master' of git://github.com/TeamGlorious/explorify into WIP
Merge pull request #21 from sbokaie/WIP

Wip