Merge branch 'develop'
Merge branch 'develop'
Fixed a crash related to a wrong method invocation
Bump version
Merge branch 'develop'
Include the description field when generating json
Merge pull request #13 from jdelStrother/master

Include the description field when generating json
Merge branch 'master' into develop