diff --git a/ChangeLog b/ChangeLog
index d656eb7c4524f1e56f3e470785f36c5deeefc599..69b7550875e0ab227da0246150fa98abad3d2d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-07-14 Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>, Andrea Zoli <zoli@iasfbo.inaf.it>
+TAG v4.2.0
++ Generating stream file in the same path of the xml
++ Fix loop on rblock idref/id resolution during xml parsing
++ Fix Tail element parsing, handle it as optional
++ Fix packet name xml loading
++ long PacketLib::ByteStream::getValue() and bool PacketNotRecognized::createPacketType()
++ Fix throw on ByteStream::GetValue()
++ Fix compiler warnings
++ Add -Werror
++ Fix ByteStream and Packet initialization
++ Fix some initialization
++ added word SDFBlock::getMaxNumberOfBlocks(word rblockIndex = 0)
++ word PartOfPacket::getFieldIndex(string fieldname) compare on strings issue
++ if prefix==false set dimPrefix=0
+
+
 2014-04-26 Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>, Andrea Zoli <zoli@iasfbo.inaf.it>
 TAG v4.1.0
 + Add support for xml config files.
diff --git a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate
index 1db0c31aaa7dc20c73b3174ed4d2c5b28d8e3f61..a3eb68eb5c480e9f7b33a04f0bef87ce98136698 100644
Binary files a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate and b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate differ