Fixed build errors
Manually adding the files for testing
Merge pull request #18 from gabrielrinaldi/master

Fixed build errors