first patch for 0.2.x version - v0.2.1-beta