Issue #27 Fixed