merged maartens bezier with master