Merge pull request #136 from orodley/source-changes