Refactored to new syntax
Added readme