Merge pull request #32 from ZZromanZZ/bugFix

Fix namespace in condition
Fixed using wrong variable