Merge pull request #69 from branan/fix_source_test