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