Basics

Merging Basics branch into Master branch.