changed logic
Merge pull request #3 from pillow89/johannes

changed logic
Merge branch 'master' of https://github.com/pillow89/Test into test1