Merge branch 'master' of git://github.com/RubyLouvre/avalon
Merge branch 'master' of github.com:zhiyan/avalon