Merge branch 'refactor' of github.com:NOPping/gstack into refactor