Fix merge conflicts
Resolve merge conflicts
meh
Merge branch 'development' of https://github.com/tuxedio/tuxedo-proto into development