first commit
Merge https://github.com/mikeinvb/feeder