Modification for version 1.0.1 including performance improvement etc.