Fix and/or if statements, and name check in vf rm
Merge pull request #24 from cybojanek/master

Fix and/or if statements, and name check in vf rm