added between to condition
fixed issue #378
added debug messages to investigate #379
Merge branch 'release/v2.0.4' into develop