Fix for upstream changes
Release v0.2.1