Issue #15 Fixed