Merging changes from GitHub
Merge branch 'master' of https://github.com/yasameen/planet