Merge 1.0.1 version (sent to market)