Merge pull request #2 from visualJ/master

Codeverschoenerung