Holding off on merge until later date

Thought this was fixed in develop already (further improved in new_sensors branch)

Seeing as how master is the front facing branch, I fixed all cases of it there since it is still an issue. Doesn't seem like a good idea to have broken examples in the version that people would actually be working with so I treated it as a hotfix and slapped it in there, merge was conflicting so I closed it and will address that in the future.