everything is working now
Merge branch 'master' of https://github.com/SinisterMinister/omnomnom