Version 1.06
Merge branch 'master' into VS2003