Changes from pull request #3 from @aaronpk