Martin

Merging martins branch into master