Merge pull request #18 from QvantLabs/dev

From QL - Dev
fixing problems prior to release.
Merge pull request #59 from arturo-mayorga/dev

Preparing release.