Shortened XML elements and attributes names to resolve #33
Merge branch 'master' of github.com:globalbility/stage