Fixed #123

This commit resolves issue
#123 -- see issue for
detailed description of bug and what was changed.

Also most likely fixes #63.