Merge branch 'release/1.2.0'
Merge branch 'master' of https://bitbucket.org/cwm/hypo into develop
Fixed LifeSpan methods so they're properly camelcased