updated to work for m1 Mac #131

Closed
ngardelis wants to merge 24 commits from master into master