Merge pull request #221 from tomkralidis/master

fix requirements handling