Fix for issue #21
Adding issue #21