updating code from the latest available version:
http://epa.codeplex.com/SourceControl/latest