Fix stack overflow bug #95
Rewrite to be more descriptive.
Allow for alternative name.
Add integration specs for stack overflow bug.