Gunicorned
Merge branch 'release/0.2'
Merge tag '0.2' into develop

Gunicorned
Merge pull request #1 from bwghughes/develop

Develop -> Master