Added code for Issue #14

Work for Issue #14