just a small test
Merge pull request #1 from skaestle/master

just a small test