Make otp compliant

Resolves #5