Solutions for issies #18 19#
Merge branch 'master' of https://github.com/antonlarin/aNiMated-batman