Issue #28 Solved - Really.