Merge pull request #29 from graimundo/master

[TEST] [CLEANUP] - Cleaned build and fixed test error