This fixes #56
Merge pull request #57 from enviroCar/dev

This fixes #56