Fixed @SuppressWarnings error in the tavern
Merge remote-tracking branch 'origin/Spencer'