Fixed last bugs.
Merge branch 'master' of https://github.com/Branchii/indiesvspdp

Conflicts: