Refactoring in helper for fill service
Merge branch 'master' of github.com:DDeis/Windmeal
fast fix to solve the macintosh%20hd issue