Fixed README, Closing #461
Merged manually, Closing #470
Merged manually, Closing #476