Manually merged master's readme into 0.1