Merge pull request #15 from fatcerberus/master

Minor cleanup - EditFileEventArgs
Cleanup and fixes