Rough draft of Brachem contributions
Merge pull request #2 from cbrachem/master

Draft of Carsten's contributions