Kmom02

Merge current kmom02 to master