last week progress
progress now
Merge branch 'master' of https://github.com/reddress/shared
minor edit