PSR4 Closes #16
Tests improved