Iteration4

merged with master