Fix #39, Fix #38

+ minor PHPDoc additions for better type hinting
+ fix CS