upstream bugfix and better tests
0.2.0