Merge branch 'master' of github.com:NOPping/gstack