merging kris_branch into master