conflict 2
Merge pull request #3 from mike96/6b7fd615174b0a24028386840185f504f9b11e21

PullReq3
Fix conflict