Merge pull request #9 from fraga/BuildServerIntegration

Merge from upstream master
Getting latest changes from test module