[CLEANUP] - Fixing build and test run
Merge pull request #18 from pamval/master

[CLEANUP] - Fixing build and test run