Merge pull request #33 from ironjan/master

Some fixes for errors in last pull request and some more issues
Fixed #35 by adding @ItemClick etc.