Break infinite recursion that leads to segfault.
Merge pull request #24 from ellert/master

Break infinite recursion that leads to segfault.