Changes based on pull request 3 from mikepage