Merge pull request #9 from LaborDayJam/john

Fixed merge issues