Big Revision for all Modules
Merge branch 'master' of https://github.com/dschamal/FiledAPing