Possible fix for the build problem
Merge pull request #11 from markohlebar/feature/alcatraz_fix

Possible fix for the build problem