fixed miso and added a test for it
resolve Makefile conflict
resolve another conflict
resolve another conflict
more conflicts
Merge remote branch 'upstream/master'