Resolving conflicts on the addition of Excel results support.
Fixed 2 bugs. Looks good otherwise.