This closes #45

or/and changed to ||/&&. Also, some messages were updated.