My own branch for Caya development, all work here will be merged into the official svn tree by myself.