Merge branch 'master' of https://github.com/jvogt/now
Merge branch 'master' of https://github.com/jvogt/now