Pushing the 1.0.x changes upstream
Merge pull request #19 from vhalbert/1.0.x_changes

Pushing the 1.0.x changes upstream