Merge pull request #201 from shadlaws/master

Fix formatting from last commit: && --> AND