Merge with CyanKang