Merge pull request #14 from jamesdsmith/develop

Updating develop with release 0.2