Merge pull request #77 from JurSch/master

Fixed Merge