fix #360 #363
Merge branch 'master' of github.com:RubyLouvre/avalon