Fixes #110
0.3.5
conflict