Merge pull request #16 from wick-ed/master

reformatting to fit code style
reformatting to fit phpcs