adding a bunch of stuff
Merge branch 'master' of https://github.com/shrander/neader