attempt to integrate changes from #440
attempt to integrate changes from #440

zstao/TimelineJS,anxintiancai/TimelineJS,djaney/TimelineJS,wangjun/TimelineJS,pom95/timeline,1modm/TimelineJS,deenjohn/TimelineJS,zstao/TimelineJS,ycaihua/TimelineJS,wangjun/TimelineJS,NUKnightLab/TimelineJS,landsurveyorsunited/TimelineJS,zstao/TimelineJS,NUKnightLab/TimelineJS,CrossLead/TimelineJS,JoaquinSiabra/TimelineJS,noikiy/TimelineJS,CrossLead/TimelineJS,JoaquinSiabra/TimelineJS,deenjohn/TimelineJS,matt-edgedesign/Timelinejs,NUKnightLab/TimelineJS,james-logan/TimelineJS,LauraHilliger/TimelineJS,wangjun/TimelineJS,LauraHilliger/TimelineJS,anxintiancai/TimelineJS,ycaihua/TimelineJS,JoaquinSiabra/TimelineJS,landsurveyorsunited/TimelineJS,ryekee/TimelineJS,deenjohn/TimelineJS,stea4lth/TimelineJS,stea4lth/TimelineJS,ryekee/TimelineJS,pom95/timeline,landsurveyorsunited/TimelineJS,angeliaz/TimelineJS,stea4lth/TimelineJS,djaney/TimelineJS,noikiy/TimelineJS,djaney/TimelineJS,pom95/timeline,LauraHilliger/TimelineJS,james-logan/TimelineJS,1modm/TimelineJS,ycaihua/TimelineJS,james-logan/TimelineJS,angeliaz/TimelineJS,noikiy/TimelineJS,matt-edgedesign/Timelinejs,ryekee/TimelineJS,anxintiancai/TimelineJS,matt-edgedesign/Timelinejs,1modm/TimelineJS