version updated to 2.1
Merge branch 'master' into jailbreak