#504 - Refactored to work with Thymeleaf 2.1