final update
Merge pull request #40 from Bob-Maestri/herine_fix

final update