Fixes. Close #246
Update reqs