Pull Request #136 changes

Edited to match PR #136 and minor translation changes.