adds the fix from #191.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/teaspoon/engine.rb