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