Merge branch 'ktong_dev' of https://github.com/ktong/cornerstone into ktong_dev