Fixed #35 by adding @ItemClick etc.
Merge branch 'master' into design