Updated with version 4.08 from codeproject.com