Merge From http://github.com/kbc-developers