Resolved #6, fixes #3
Took 3h
Merge branch 'master' of https://github.com/ifiske/ifiske