Merge pull request #67 from alfeko/mattsonbranch

Mattsonbranch
Merge pull request #70 from alfeko/master

Merge pull request #67 from alfeko/mattsonbranch