Merge pull request #69 from snakevil/master

Fixed unit-tests issues.
Merge pull request #70 from snakevil/master

Got-started to use `PHPMD'.