Finish Feature-files-wrapper, fixes #2