Fixes #132, Fixes #140

 Please enter the commit message for your changes. Lines starting