Fixes #10, fix for proper file naming