Setting file stubs
Merge origin/master