Merge pull request #1 from GovReady/master

Recommit eariler changes