added suffix stuff. fixes #1