Code

changes in trunk: