Merge pull request #1 from dssg/master

New Stuff