Ready to integrate
Merge branch 'master' of ssh://github.com/soapy1/stream-loan