Multiple fixes.
Merge branch 'master' of github.com:times/moments
Pushing forward changes