Merge branch 'master' into style
deleted comments
Merge pull request #36 from jaimieli/style

Style