grammar
add callback handlers
note on persistency
Merge pull request #13 from lipp/master

grammar