Merge master
Merge master again
Update build instructions

NOTE: build is a work in progress, probably broken