Tighten up modifier syntax
Update documentation to reflect neatened syntax
Merge branch 'v2.0.0'