change for #2
Merge remote-tracking branch 'origin/improve-error-message'

Conflicts:
	meow/meow.py