Merge pull request #95 from jkuk/master

bleep bloop
Merge pull request #96 from jkuk/master

asda
Slightly working
Merge pull request #97 from WannabeSid/master

Slightly Working
changed back ends