Fork from liamstask/goose