Merge pull request #67 from alfeko/mattsonbranch

Mattsonbranch