Fix for #6
Merge pull request #9 from opencarthelp/v1.5.4.x

Fix for #6