fixy fix
fix'd
Merge pull request #21 from uldivad9/master

fixed issues 11 and 6