adding more type support
misc update
Merge branch 'master' of https://github.com/zhaozhang/amfora