Fixed negative remaining time bug. Closes #117