Patchnamesuggestion d7

Updates for #47 en #55