Merge pull request #124 from glenwayguy/master

Fixed merge conflicts.
More merge conflicts fixed