Merge pull request #3 from hanskhe/master

Pullpull
Merge pull request #4 from hanskhe/Feature_2

Merge pull request #3 from hanskhe/master