Fix Millisecond Crash - Improved
Merge pull request #26 from eddturtle/bugfixes

Fix Millisecond Crash - Improved