change format
Merge ssh://github.com/asatohan/richservlet