Merge pull request #254 from viniciusjarina/fix_build