Applied updates for version 0.2.1