Changed static classes.
Merge branch 'master' of https://github.com/kishan-patel/dp