replacing 'and' with '&&'
Merge pull request #1900 from komidore64/and_and

replacing 'and' with '&&'