Timing Bugfix
Merge pull request #23 from GrafSeismo/master

Timing bugfix