Fixed Issue #18 and working on Issue #5