Made stricter about delimeters. Used Go 1.1 return requirements.