Fixed startAt endAt.
Merge branch 'master' into EA-35