first commit for branch 0.9.4