full fix
Merge pull request #2 from devserg/patch-2

full fix