Merge branch 'master' of git://github.com/Fidouda/Majabaja
Merge branch 'master' of git://github.com/Fidouda/Majabaja
conflict resolved level1
Merge pull request #14 from mamio/master

level 1 such improvements