Merge pull request #529 from mhaskel/source_compatibility