Updated TrunkJS
merging changes