Code Optimization
Merge branch 'master' of https://github.com/filippo91/appPdS