fixup! Merge pull request #77 from camael24/f/fixes