Merge release/1.0.1 to master