Ver. 1.1. Some bugs fixed