Feature/issue 130

I added a test for the bug, then fixed it and added doc.  It's pretty simple and should be complete.