Iss4

Merging changes to master