back port of goes patch to v0.4.1
Fix to checking of end and start
Merge pull request #1043 from ehsteve/0.4.1_goes_patch

[BugFix]: 0.4.2 goes patch