Merge pull request #2 from FINRAOS/master

Rebase
Migration changes
Merge pull request #90 from mpeter28/master

Migration Changes