Code

Added changes from trunk.