Adding basic 3.4 support, haven't tested new code against 3.3 though