hapi 6.0

Closes #7