Merge pull request #77 from JurSch/master

Fixed Merge
Merge pull request #4 from WOYM/master

Merge pull request #77 from JurSch/master