merge from cKlee fork