Closes #184 - Add missing @Override annotations

Pull request for #184