bug fix and feature add
Merge pull request #80 from chipsergik/S5-iter1

bug fix and feature add