Fixed issue #40

Added 'or round == 0' to endround method
Fixed nessacary bugs issue #37 - Caroussel