fix issues #541 , #444
Merge branch 'groma'