Direct callback function set
fix style
Merge branch 'unstable' of https://github.com/angelovdeodd/firesquare into unstable