Merge pull request #13 from QvantLabs/dev

From QL - Dev
Merge branch 'dev'
Fixing build problems!
Merge branch 'master' into dev
Merge pull request #42 from arturo-mayorga/dev

Dev - pulling release updates from Main