ready for package distribution
fix merge