Derivation of an improved simple point charge model for liquid water: SPC/A and SPC/L