Streams consolidation
Merge branch 'master' of github.com:RyanThompson/Users