Merge pull request #1 from rherschke/master

These are the initial sources...