:bug: fix incompatibility to some file name schemes

fixes #131
fixes #121