Fix #120
Fix #115
Merge branch 'master' of https://github.com/tdwtf/WtfWebApp