discussion points
Merge pull request #1 from Hunk86/master

discussion points