More changes
Merge pull request #27 from RSchade/stuff

More changes