Fix nil check and add ElapsedMilliseconds
Merge pull request #1 from xsleonard/patch-1

Fix nil check and add ElapsedMilliseconds