Merge pull request #1 from alvincrisuyklab/dev-kc

merge dev-kc to dev