Changed some stuff
Merge pull request #2 from sz-oke/new-branch

Changed some stuff