Resolving README conflict

Also, a previous commit fixes #32.