Did some refactoring
Merge branch 'master' of https://github.com/plindborg/where-is-iss