Handle the case where current > total
Merge pull request #19 from bumpy1/master

Handle the case where current > total