Corrected typo.
Fixed potential buffer overflow problem.
Merge branch 'dev' of github.com:espena/nlconv into dev