Fixed #37 and fixed #36