Fix #9 & #10, PSR-1 constant names
PSR-4 #3
Merge remote-tracking branch 'origin/master'