Requirements cleanup
Merge pull request #47 from retr0h/working

Requirements cleanup