Merge pull request #11 from QvantLabs/dev

From QL - Dev
.