Merge branch 'kibotu-master'
merge cleanup
Merge branch 'master' into kibotu-master