Merge.
Merge branch 'master' of github.com:CreativeMobile/Donjuan2x2
Some fixes.