New hybrid battery model that takes into account both electric circuit characteristics and non-linear battery properties | IEEE Conference Publication | IEEE Xplore