Updated merge conflict on #82

this should bring #82 up to speed with the latest master.