Fixed #30 and Fixed #37