update
Merge branch 'master' of https://github.com/chutaicho/alib
updated