hapi 0.15
merge