Added code for Issue #14