Fix 12 14

Fixed Issue #12 and Issue # 14.