Issue #16 - Fixed