Merge pull request #346 from Bonder-MJ/master

Long overdue pull request