Issue #170 and Issue #176 - Fixed.