fixed HTTP 500 Error problem
Merge branch 'mitja'