Added vertical and horisontal separator support. Included ASSERT usage.