Initial commit
Merge test/master into Kmom02