Merge fixes for version 0.2.0