Merge pull request #8 from maximosanz/master

filepath included