Merge pull request #142 from Verkalets/fixing

fix
fix other