Updated readme
Refactored to new syntax
Fixed conflict