More merge conflicts fixed
Merge pull request #125 from glenwayguy/master

More merge conflicts fixed