Master integration

Fixing error during compilation and linking