General updates
Updates
Merge pull request #1 from rexyeung/dev-rex-1

Dev rex 1