fixed #10 and fixed #11