Timing changes
Fixing conflicts 1
Merge pull request #13 from gatkin/taylor2

Taylor2