Applied changes made on mvc-samples branch