Merge remote-tracking branch 'origin/master' into gh-pages
Merge pull request #6 from reiepl/gh-pages

gh-pages update master
Sole-proprietor

Let's streamline to sole-proprietor
Merge remote-tracking branch 'origin/master' into gh-pages