Added the basic structure
Merge origin/master