Merge pull request #120 from WynnChen/master

fix 2 typo.
Apply f6df0eb32d382c04b01b679f7801213c333ceba8
Closes #128
Fix code examples (4.37 and 4.38)
Merge pull request #130 from alexshadow007/examples

Fix code examples (4.37 and 4.38)
Merge branch 'master' into typofix
fix a minor typo in database.xml