Code changes for PR1

Updates code to match @bobcallaway's README patch