I recently had the same issue with my S4 and I came across a very cheap but effective fix. There is an app on the play store called "Real Battery" that scales your battery level down to the percentage it dies it. My phone kept dying at 30% so I set the indicator to 30% and it scaled my battery...