Return self class
Merge pull request #63 from jsifalda/syntax

Better syntax support