Some small improvements and added comments.
Merge branch 'master' of https://github.com/cloudstore/main.git