quick fix for skip count issue #135
Merge branch 'master' into skunk