Merge pull request #48 from nsendetzky/master

Re-adds merges for Dimitri