Iteration4

Merging Iteration-4 with master.