Merge pull request #1 from GovReady/master

Recommit eariler changes
Merge pull request #39 from roacobb/master

Merge pull request #1 from GovReady/master