Merge pull request #1 from nunopress/develop

First commit
Merge pull request #2 from nunopress/master

Merge pull request #1 from nunopress/develop