bug 35 resolved
Merge remote-tracking branch 'origin/timescale' into timescale