Fixed a bug
Merge branch 'master' of github.com:wridgers/zapp