Fixed for newer versions
Separated classes
Version bump, 0.3.0