Finalbranch

Merging master with final branch