Pull request #128
Cleaned up from pull request #128