Merge pull request #73 from wick-ed/master

reviewed diff
reformatting to fit code style