Merge branch 'release/1.0.2'
updated config and new version of ckit