Separate INTERVAL and COUNT in RRULE

Change of two fields with same resultant name in RRULE.

Fix for #2