Grammar Issue

Closes #20