Fixed #5 - improve interval parsing