Fixed #32 and fixed #35