committing for backup
fixing merge conflict
Merge branch 'dev' into delimiterBug
fixes #83
committing for backup

I guess
committing for backup