Slightly working
Merge pull request #97 from WannabeSid/master

Slightly Working