Add missing @Override declarations
Merge pull request #200 from stevenschlansker/override

Add missing @Override declarations