Implementation of check done, but not refactored.
Merge branch 'master' of github.com:sangisos/pkdhomeass1