problem 2
Merge pull request #4 from dano8957/master

problem 2
Fix conflicts