fixed issue 17 - problem with BETWEEN solved