reformatting to fit code styles
Merge pull request #16 from wick-ed/master

reformatting to fit code styles