Merge branch 'develop'
Version bump.
Had wrong name. Fixed.
Added support for 'debug' option.
Merge branch 'debug' into develop