Fix for #16
State is saved and restored due to current item index
Merge pull request #17 from almozavr/measurement_improvements

Measurement improvements. Once more