Refactoring to make sources easy to add
Adding a bunch more sources =)
Merge pull request #23 from icbat/add-more-sources

Add more sources