Grammar corrections. Resolves #15