Fixed Issue #2 and Issue #15