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