Merge pull request #8 from bwright1558/master

Re-added locales.h header
Update email
Make sure strings are null-terminated