fixed #1 and closed #1