Fix for pull request #13 to accommodate #12 –by OSF

Fix for pull request #13 to accommodate #12 –by OSF