prepared 0.9.4 branch
Merge pull request #370 from kevinpapst/0.9.4

prepared 0.9.4 branch