Merge pull request #45 from ahalterman/master

Lots more sources