new syntax, readme updated, tests updated