Fixed issue #4, redirect to wrong place after form submit
Merge branch 'jt4' into dev