Merged my versions

Merged my version for ATV2 jailbroken and my standard one with multiple
options