Prevent warning and notices described in #22
Merge branch 'master' of github.com:globalbility/stage