#58 - fix diverging dependency versions
Merge branch '3.0'