Fixes #54 ,  Fixes #53