Fixed #58, Updated MVC template