Merge fixes for Issue #76

Fixed issue using suggested solution from Issue #76.