Jesin contributions

merge jesin code into master branch.