Java 8! Cleaner code, ahoy!
Merge branch 'master' of https://github.com/shieldbug1/S1Core