Fix for circular import issue, and bump in version to 0.3.1