Split the class into two
Merge branch 'master' of github.com:Kali89/EFHack