Updates for today
Merge branch 'master' of http://github.com/rymader/5103