half-life feature
half-life updated to work with pynaa
Merge branch 'feature_half-life' into develop