Closed #13
Closed #14
Merge branch 'psr-2-compliant'