Merge fix
Test
Should work

Looked at the files that have been changed. Commented and uncommented
parts are the same.
Merge pull request #16 from LithiumNL/master

Merge fix