Fixed #31 and fixed #32.