Merge branch 'master' of https://github.com/johnmoore/iOStream
Merge branch 'master' of https://github.com/johnmoore/iOStream