Fork of https://github.com/embolalia/willie, fixes, stabilization, additional features added