Moved mustache handler to EOF
Merge branch 'development'