Merge pull request #9 from vascool/fr