Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated Stop enum
Merge pull request #4 from daverboy23/master

Stop enum changed name