Fix some PHPMD errors/warnings
Merge pull request #14 from wagnert/master

Fix some PHPMD errors/warnings