initial commit for 0.9.1 compatibility