Merge pull request #12 from johmanx10/master

_resolveFilename && filter arguments