Fix #134 and Fix PSR-2