Fix uninitialized pointer bug (fixes #5)
Merge branch 'test-5'