Rex 20141005
Merge pull request #2 from rexboy7/rex_1007

[W40] Rex - 20141005