Updated 1.0.5 with pull request changes.