Merge branch 'raven' of https://github.com/ludwiksh/Etales
update bugs
meger
merger
update
update
update
update
update
update