Merge pull request #112 from IjonTichy/master

bzzzzzzz
Merge pull request #113 from IjonTichy/master

OH YEAH STRIFE EXISTS AND MAYBE COMPATIBILITY WITH THAT WOULD BE NICE I MEAN PEOPLE ASKED FOR IT SO SURELY THEY MEANT TO USE IT RIGHT GUYS