compatibility with C99
Merge branch 'master' of git@github.com:erlocator/erlocator.git