Added first and last click info
Merge branch 'sonicapi1'