Merge pull request #1 from nunopress/develop

First commit