Kondo

merge kondo branch to master