Clean up the code and merge the changes to the 'rebuild-mvc' branch. #105

Closed kaidatavis closed 6 years ago