Refactoring to create an exercise
Merge origin/master into refactoring_views