Presentation branch

Merging presentation branch to master