Bug/fix statii

Fixes #35. #reviewmerge @tlovett1