Fix issue 8955 and 5
small fix
small change
small change
Merge pull request #6 from whbosm/patch-1

Fix issue 8955 and 5