Merge pull request #7 from adlnet/master

Update from adl master
Add note on delimiters
Merge pull request #493 from garemoko/delimiters

Delimiters