full fix
Merge pull request #31 from devserg/patch-24

full fix