set 404 handling
Merge branch 'master' of github.com:Jocbe/SettingWork
minor code cleanup