Merge pull request #1 from WheBurr/develop

0.1