Patch 2

merging the branches