Optimal power flow with storage in DC electrified railways. Issue 3 (3rd May 2016)