Fixed Issue #23 and Issue #88