Change filename parsing code slightly
Resolve merge conflict from @JelloRanger's changes
Merge pull request #22 from pdpiech/master

Resolve merge conflict from @JelloRanger's changes