Merge D-Byte's improvements into development branch