merge fixes on OS X #5428128771748
merge fixes on Linux
readme fixes