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