Fixed Issue #9 & Issue #11