Merge pull request #29 from Drewzar/master

new math!!!