Merge pull request #120 from chrqls/dev

Big update on mobile + cleaning code