Fixed error with fishing (v0.1.4.a1)
Merge branch 'v0.1.4.a1' into v0.1.4.a21