Merge branch 'master' of github.com:neuling/WallStream