update
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
update
update
update
merge
Merge branch 'raven' of https://github.com/ludwiksh/Etales
update
Merge branch 'raven' of https://github.com/ludwiksh/Etales
fix final bugs