Woo... added all of the objects for easy parsing. You're freaking welcome john...
Merge branch 'master' of github.com:rnc505/BPiAssassin

dat merge doe