Merge pull request #17 from jvelasques/master

#3255 - Removing unintentionally commited file
[CLEANUP] - Fixing build and test run
Merge pull request #18 from pamval/master

[CLEANUP] - Fixing build and test run