changed names of 2 files and modified a few things
Dude
Merge pull request #253 from andy2013march/master

Added 2 exceptions and a few modifications
Merge pull request #254 from WannabeSid/master

NewTimeStampDialog bug fixes.
Can't get before January 2013