Issue #78 fix and requirements.txt change

See the latest commits