Frank's bugfixing
Merge branch 'master' of github.com:RCreyghton/webdb