Added punctuation
Trying again fixes #3
fixed conflicts