Code cleanup by the request of original module maintainer
Merge branch 'master' of github.com:globalbility/stage