Bringing on master some fixes of https://github.com/inogs/bit.sea/issues/130, bug 1 and bug 4
Bringing on master some fixes of #130,
bug 1 and bug 4