update from svn, 1.0.3, part2