Apply fixes
Merge pull request #21 from zzak/4-2-final

Apply fixes