Merge pull request #1 from mike96/master

merge1
git conflict
fix conflict