Changed Z to uint16_t outside of OTI, fixes #7
Merge branch 'develop' into feature/liborq

* develop:
  Changed Z to uint16_t outside of OTI, fixes #7