Make less dependent on optional packages
Prepare for version 0.2.4