Switching to PSR-2 Coding Style, closes #2