Added support for non 4/4 time signatures