Merge pull request #4 from StevenReitsma/master

Add f-prefix to user list fetcher
Add f-prefix to user list fetcher
Merge remote-tracking branch 'upstream/master'
Keep directory structure