Bug fixed #6, Feature closed #7