adding hack to handle C++ libraries
    Fixes https://github.com/TeamMentor/Master/issues/379
Merge branch 'Issue_379'