Fixed merge error in readme, updated build