Template changes to fix #52.
Merge pull request #55 from HSWebteam/server_fix_52

Template changes to fix #52.