Changes made as per kmonson (issue #169)