Fixed a couple of errors
Merge pull request #2 from CaptainShadows/master

Fixed Nameing issue, and checking same fields twice. thanks captainshadow :)