Merge branch 'master' into ReFactorFrontEnd
Fixed bug with missing libraries
Merge branch 'master' into ReFactorFrontEnd