pull merge from flumbee-master