Merge javruben-master