add classes and interfaces
merge master
Merge pull request #5 from alfeko/mattson2

Mattson2