CS fixes
Merge pull request #7 from GrahamCampbell/cs

CS Fixes
Use && and ||