Merge pull request #2 from FINRAOS/master

Updating personal fork