Fixed Issue #12 (almost)