Merge pull request #44 from nutty898/master

solve conflict