20140409 updated to 0.9.6