much good, very work, fixes #1