before merge;
fix problems
update
update
update
update
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
update