Merge pull request #309 from menny/master

v121
Merge pull request #310 from menny/master

releasing v121