some updates first
Merge branch 'master' of https://github.com/greenwoodents/reminder