Merge pull request #70 from alfeko/master

Merge pull request #67 from alfeko/mattsonbranch
Fixed classes
Merge pull request #74 from alfeko/mattsonbranch

Mattsonbranch